Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added a Date/time and round type filter for log updates #6713

Merged
merged 14 commits into from
Dec 6, 2023
Merged

Added a Date/time and round type filter for log updates #6713

merged 14 commits into from
Dec 6, 2023

Conversation

konavivekramakrishna
Copy link
Contributor

@konavivekramakrishna konavivekramakrishna commented Nov 25, 2023 •
edited by rithviknishad
Loading

DailyRoundsFilter component

WHAT

🤖[deprecated] Generated by Copilot at 9cb6f5d

This pull request refactors the code for filtering daily rounds in the consultation updates tab. It introduces a new component DailyRoundsFilter that renders a popover button for selecting the filter criteria. It also removes the showAutomatedRounds state variable and UI elements, and replaces them with a filter state variable and query parameter that contains the round type, from date, and to date values. The filter state variable is defined by a new interface DailyRoundsFilterModel in the src/Components/Facility/models.tsx file.

Proposed Changes

image

@coronasafe/care-fe-code-reviewers @coronasafe/code-reviewers

Merge Checklist

  • Add specs that demonstrate bug / test a new feature.
  • Update product documentation.
  • Ensure that UI text is kept in I18n files.
  • Prep screenshot or demo video for changelog entry, and attach it to issue.
  • Request for Peer Reviews
  • Completion of QA

HOW

🤖[deprecated] Generated by Copilot at 9cb6f5d

  • Add a new component DailyRoundsFilter to filter the daily rounds list by round type, from date, and to date (link)
  • Modify the DailyRoundsList component to use the DailyRoundsFilter component and the filter state variable instead of the showAutomatedRounds prop and query parameter (link)
  • Remove the unused showAutomatedRounds state variable, UI elements, and prop from the ConsultationUpdatesTab and DailyRoundsList components (link, link, link)
  • Add a new interface DailyRoundsFilterModel to define the shape of the filter state variable (link)

@konavivekramakrishna
Add DailyRoundsFilterModel interface and
9cb6f5d 
DailyRoundsFilter component
@konavivekramakrishna konavivekramakrishna requested a review from a team November 25, 2023 17:31
@konavivekramakrishna konavivekramakrishna requested a review from a team as a code owner November 25, 2023 17:31
@vercel Vercel
Copy link

vercel bot commented Nov 25, 2023 •
edited
Loading

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
care-storybook ✅ Ready (Inspect) Visit Preview 💬 Add feedback Dec 5, 2023 1:51pm

@netlify Netlify
Copy link

netlify bot commented Nov 25, 2023 •
edited
Loading

✅ Deploy Preview for care-egov-staging ready!

Name Link
🔨 Latest commit e150b7b
🔍 Latest deploy log https://app.netlify.com/sites/care-egov-staging/deploys/656f2abac44f1a00084f3cbe
😎 Deploy Preview https://deploy-preview-6713--care-egov-staging.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@konavivekramakrishna
Copy link
Contributor Author

@rithviknishad

still date/time filter is not functional apart from that any changes required

@konavivekramakrishna konavivekramakrishna changed the title Adding a Date/time and round type filter for log updates Added a Date/time and round type filter for log updates Nov 25, 2023
@rithviknishad
Copy link
Member

Also, clear the merge conflicts

@github-actions GitHub Actions
Copy link

👋 Hi, @konavivekramakrishna,
Conflicts have been detected against the base branch. Please rebase your branch against the base branch.

This message is automatically generated by prince-chrismc/label-merge-conflicts-action so don't hesitate to report issues/improvements there.

@github-actions github-actions bot added the merge conflict pull requests with merge conflict label Nov 27, 2023
@rithviknishad rithviknishad added needs testing and removed merge conflict pull requests with merge conflict labels Nov 27, 2023
@rithviknishad
Copy link
Member

Required Backends:

cc: @nihal467

@rithviknishad
Copy link
Member

@konavivekramakrishna I've taken care of the taken_at date time range filter too!

@rithviknishad
Copy link
Member

@konavivekramakrishna VENTILATOR rounds are white-labelled as Critical Care in the log update form. We can white-label it here too.

image

@konavivekramakrishna
Copy link
Contributor Author

konavivekramakrishna commented Dec 1, 2023 •
edited
Loading

image
image

changed to lowercase because in log update it is lowercase.

@konavivekramakrishna
Copy link
Contributor Author

should I remove ICU and automated from filter?

rithviknishad
rithviknishad requested changes Dec 1, 2023
View reviewed changes
Copy link
Member

@rithviknishad rithviknishad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use translations instead.

Also update the EN locale json file to have this.

src/Components/Facility/Consultations/DailyRoundsFilter.tsx Outdated Show resolved Hide resolved
src/Components/Facility/Consultations/DailyRoundsFilter.tsx Outdated Show resolved Hide resolved
@rithviknishad
Copy link
Member

should I remove ICU and automated from filter?

Remove ICU for now, Automated must be kept.

We don't seem to have a single ICU round record in the database.

image

@nihal467
Copy link
Member

nihal467 commented Dec 5, 2023

LGTM

@khavinshankar khavinshankar merged commit f746576 into ohcnetwork:develop Dec 6, 2023
35 of 36 checks passed
@konavivekramakrishna konavivekramakrishna deleted the test1#6690 branch December 8, 2023 18:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@khavinshankar khavinshankar khavinshankar approved these changes

@rithviknishad rithviknishad rithviknishad approved these changes

@gigincg gigincg Awaiting requested review from gigincg

Assignees
No one assigned
Labels
tested
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Adding a Date/time and round type filter for log updates
4 participants
@konavivekramakrishna @rithviknishad @nihal467 @khavinshankar